Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use XX instead of WW in src/controller/CHIPDeviceController.cpp for u… #15085

Merged
merged 1 commit into from
Feb 11, 2022
Merged

Use XX instead of WW in src/controller/CHIPDeviceController.cpp for u… #15085

merged 1 commit into from
Feb 11, 2022

Conversation

vivien-apple
Copy link
Contributor

…nknown country code

Problem

src/controller/CHIPDeviceController.cpp defines the country code as WW when it is unknown. I really don't know what is the origin of this value - there may be something that I have just missed.

In any case, my understanding is that the spec expects XX should be used instead: The special value XX SHALL indicate that region-agnostic mode is used.

Change overview

  • Replace WW instead of XX

Testing

I have seen that when working on #14660 where I end up with the test failing because WW is stored instead of XX

@vivien-apple vivien-apple self-assigned this Feb 11, 2022
@github-actions
Copy link

github-actions bot commented Feb 11, 2022 •
edited
Loading

PR #15085: Size comparison from ad68b4b to 52e9ced

Decreases (1 build for linux)
platform target config section ad68b4b 52e9ced change % change
linux chip-tool-ipv6only arm64 (read only) 8195468 8195452 -16 -0.0
.rodata 436148 436132 -16 -0.0
Full report (43 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section ad68b4b 52e9ced change % change
cyw30739 light cyw930739m2evb_01 (read/write) 595258 595258 0 0.0
.app_xip_area 496672 496672 0 0.0
.bss 81284 81284 0 0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 553062 553062 0 0.0
.app_xip_area 456044 456044 0 0.0
.bss 79756 79756 0 0.0
.data 608 608 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 571998 571998 0 0.0
.app_xip_area 465724 465724 0 0.0
.bss 88684 88684 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 909688 909688 0 0.0
(read/write) 129104 129104 0 0.0
.bss 127072 127072 0 0.0
.data 2032 2032 0 0.0
.text 909680 909680 0 0.0
BRD4161A+rpc (read only) 897132 897132 0 0.0
(read/write) 145764 145764 0 0.0
.bss 143632 143632 0 0.0
.data 2132 2132 0 0.0
.text 897124 897124 0 0.0
window-app BRD4161A (read only) 844752 844752 0 0.0
(read/write) 127168 127168 0 0.0
.bss 125264 125264 0 0.0
.data 1900 1900 0 0.0
.text 844744 844744 0 0.0
esp32 all-clusters-app c3devkit (read only) 945478 945478 0 0.0
(read/write) 1400338 1400338 0 0.0
.dram0.bss 68128 68128 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 199048 199048 0 0.0
.flash.text 945478 945478 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 995111 995111 0 0.0
(read/write) 465608 465608 0 0.0
.dram0.bss 73272 73272 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 226144 226144 0 0.0
.flash.text 989727 989727 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 685744 685744 0 0.0
.bss 78376 78376 0 0.0
.data 1904 1904 0 0.0
.text 599664 599664 0 0.0
lock k32w061+release (read/write) 691172 691172 0 0.0
.bss 78768 78768 0 0.0
.data 1948 1948 0 0.0
.text 604656 604656 0 0.0
linux all-clusters-app debug (read only) 2356761 2356761 0 0.0
(read/write) 141600 141600 0 0.0
.bss 56128 56128 0 0.0
.data 1296 1296 0 0.0
.data.rel.ro 78488 78488 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 205893 205893 0 0.0
.text 1988642 1988642 0 0.0
bridge-app debug+rpc (read only) 1725829 1725829 0 0.0
(read/write) 85768 85768 0 0.0
.bss 40528 40528 0 0.0
.data 2034 2034 0 0.0
.data.rel.ro 38056 38056 0 0.0
.dynamic 592 592 0 0.0
.got 3976 3976 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 141740 141740 0 0.0
.text 1467589 1467589 0 0.0
chip-tool debug (read only) 8383997 8383997 0 0.0
(read/write) 246912 246912 0 0.0
.bss 33416 33416 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 206264 206264 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 460021 460021 0 0.0
.text 7408629 7408629 0 0.0
chip-tool-ipv6only arm64 (read only) 8195468 8195452 -16 -0.0
(read/write) 354385 354385 0 0.0
.bss 51681 51681 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 248680 248680 0 0.0
.dynamic 560 560 0 0.0
.got 49008 49008 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 436148 436132 -16 -0.0
.text 6998484 6998484 0 0.0
door-lock-app debug (read only) 1930985 1930985 0 0.0
(read/write) 112088 112088 0 0.0
.bss 43600 43600 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62064 62064 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 173138 173138 0 0.0
.text 1609378 1609378 0 0.0
lighting-app debug+rpc (read only) 2055273 2055273 0 0.0
(read/write) 117368 117368 0 0.0
.bss 44576 44576 0 0.0
.data 1464 1464 0 0.0
.data.rel.ro 65832 65832 0 0.0
.dynamic 608 608 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 166641 166641 0 0.0
.text 1733842 1733842 0 0.0
ota-provider-app debug (read only) 1864529 1864529 0 0.0
(read/write) 107768 107768 0 0.0
.bss 43456 43456 0 0.0
.data 1224 1224 0 0.0
.data.rel.ro 57432 57432 0 0.0
.dynamic 608 608 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 157619 157619 0 0.0
.text 1556370 1556370 0 0.0
ota-requestor-app debug (read only) 1860833 1860833 0 0.0
(read/write) 108984 108984 0 0.0
.bss 43840 43840 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 58504 58504 0 0.0
.dynamic 592 592 0 0.0
.got 4176 4176 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 151844 151844 0 0.0
.text 1560146 1560146 0 0.0
shell debug (read only) 2330553 2330553 0 0.0
(read/write) 144496 144496 0 0.0
.bss 64928 64928 0 0.0
.data 832 832 0 0.0
.data.rel.ro 73040 73040 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 206930 206930 0 0.0
.text 1967202 1967202 0 0.0
thermostat-no-ble arm64 (read only) 2150316 2150316 0 0.0
(read/write) 142225 142225 0 0.0
.bss 59105 59105 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 74984 74984 0 0.0
.dynamic 560 560 0 0.0
.got 4144 4144 0 0.0
.init 24 24 0 0.0
.init_array 328 328 0 0.0
.rodata 132908 132908 0 0.0
.text 1799264 1799264 0 0.0
tv-app debug (read only) 2528953 2528953 0 0.0
(read/write) 140960 140960 0 0.0
.bss 58752 58752 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 72984 72984 0 0.0
.dynamic 592 592 0 0.0
.got 4528 4528 0 0.0
.init 27 27 0 0.0
.init_array 888 888 0 0.0
.rodata 198093 198093 0 0.0
.text 2157938 2157938 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2398352 2398352 0 0.0
.bss 190196 190196 0 0.0
.data 5320 5320 0 0.0
.text 1360952 1360952 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2360184 2360184 0 0.0
.bss 182808 182808 0 0.0
.data 5624 5624 0 0.0
.text 1322784 1322784 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2323776 2323776 0 0.0
.bss 182696 182696 0 0.0
.data 5600 5600 0 0.0
.text 1286376 1286376 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139648 1139648 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103032 103032 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2309204 2309204 0 0.0
.bss 179948 179948 0 0.0
.data 5424 5424 0 0.0
.text 1271776 1271776 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1018015 1018015 0 0.0
bss 123132 123132 0 0.0
rodata 120044 120044 0 0.0
text 695944 695944 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 986843 986843 0 0.0
bss 120320 120320 0 0.0
rodata 111408 111408 0 0.0
text 675556 675556 0 0.0
nrf52840dongle_nrf52840 (read/write) 1033839 1033839 0 0.0
bss 124520 124520 0 0.0
rodata 118904 118904 0 0.0
text 700532 700532 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 924754 924754 0 0.0
bss 119696 119696 0 0.0
rodata 113284 113284 0 0.0
text 610980 610980 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 947839 947839 0 0.0
bss 121504 121504 0 0.0
rodata 108788 108788 0 0.0
text 638948 638948 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 855318 855318 0 0.0
bss 118096 118096 0 0.0
rodata 101960 101960 0 0.0
text 554756 554756 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 527595 527595 0 0.0
bss 53632 53632 0 0.0
rodata 49976 49976 0 0.0
text 361016 361016 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 946683 946683 0 0.0
bss 121224 121224 0 0.0
rodata 107768 107768 0 0.0
text 639004 639004 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 942603 942603 0 0.0
bss 121228 121228 0 0.0
rodata 107440 107440 0 0.0
text 635244 635244 0 0.0
shell nrf52840dk_nrf52840 (read/write) 806315 806315 0 0.0
bss 112376 112376 0 0.0
rodata 79008 79008 0 0.0
text 537352 537352 0 0.0
p6 all-clusters-app default (read/write) 2484056 2484056 0 0.0
.bss 119816 119816 0 0.0
.data 2672 2672 0 0.0
.text 1442320 1442320 0 0.0
light-app default (read/write) 2390640 2390640 0 0.0
.bss 109464 109464 0 0.0
.data 2520 2520 0 0.0
.text 1348904 1348904 0 0.0
lock-app default (read/write) 2354096 2354096 0 0.0
.bss 109184 109184 0 0.0
.data 2480 2480 0 0.0
.text 1312360 1312360 0 0.0
qpg lighting-app qpg6105+debug (read only) 595636 595636 0 0.0
(read/write) 146936 146936 0 0.0
.bss 90656 90656 0 0.0
.data 1108 1108 0 0.0
.text 590316 590316 0 0.0
lock-app qpg6105+debug (read only) 561388 561388 0 0.0
(read/write) 146936 146936 0 0.0
.bss 90640 90640 0 0.0
.data 1060 1060 0 0.0
.text 556068 556068 0 0.0
persistent-storage-app qpg6105+debug (read only) 99520 99520 0 0.0
(read/write) 146940 146940 0 0.0
.bss 24004 24004 0 0.0
.data 176 176 0 0.0
.text 94200 94200 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 877134 877134 0 0.0
bss 90456 90456 0 0.0
noinit 37160 37160 0 0.0
text 615198 615198 0 0.0

@vivien-apple vivien-apple merged commit 0bd4b85 into project-chip:master Feb 11, 2022
jamesluo11 pushed a commit to jamesluo11/connectedhomeip that referenced this pull request Apr 26, 2022
@vivien-apple @fuxingguo16
Use XX instead of WW in src/controller/CHIPDeviceController.cpp for u…
d97c501 
…nknown country code (project-chip#15085)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@austinh0 austinh0 Awaiting requested review from austinh0

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees

@vivien-apple vivien-apple

Labels
controller review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vivien-apple @andy31415 @Damian-Nordic